gtk/gtkaction.h gtk/gtkbuildable.h gtk/gtkbuilderprivate.h

2008-06-23  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkaction.h
	* gtk/gtkbuildable.h
	* gtk/gtkbuilderprivate.h
	* gtk/gtkcelllayout.h
	* gtk/gtkentrycompletion.h
	* gtk/gtkfilechoosersettings.h
	* gtk/gtkfilesystem.h
	* gtk/gtkfilesystemmodel.h
	* gtk/gtkicontheme.h
	* gtk/gtklinkbutton.h
	* gtk/gtkpagesetup.h
	* gtk/gtkpapersize.h
	* gtk/gtkprintcontext.h
	* gtk/gtkprintoperation.h
	* gtk/gtkprintoperationpreview.h
	* gtk/gtkprintsettings.h
	* gtk/gtkrecentchooserprivate.h
	* gtk/gtkrecentmanager.h
	* gtk/gtksearchengine.h
	* gtk/gtktexttag.h
	* gtk/gtktreeselection.h
	* gtk/gtktreeviewcolumn.h
	* gtk/gtkuimanager.h: remove redundant inclusion of <glib.h> and
	<glib-object.h>. There is no point in relying on them being pulled
	in by other headers in some places and placing them explicitly in
	other places, so choose the "as little includes as possible"
	approach and get rid of them.

svn path=/trunk/; revision=20675

diff --git a/ChangeLog b/ChangeLog
index 46b737de4ec8cbb27bd4a932631ec762bbf56b25..8d521c41fd324bf63b44c0618ddf7617b8b742cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2008-06-23  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkaction.h
+       * gtk/gtkbuildable.h
+       * gtk/gtkbuilderprivate.h
+       * gtk/gtkcelllayout.h
+       * gtk/gtkentrycompletion.h
+       * gtk/gtkfilechoosersettings.h
+       * gtk/gtkfilesystem.h
+       * gtk/gtkfilesystemmodel.h
+       * gtk/gtkicontheme.h
+       * gtk/gtklinkbutton.h
+       * gtk/gtkpagesetup.h
+       * gtk/gtkpapersize.h
+       * gtk/gtkprintcontext.h
+       * gtk/gtkprintoperation.h
+       * gtk/gtkprintoperationpreview.h
+       * gtk/gtkprintsettings.h
+       * gtk/gtkrecentchooserprivate.h
+       * gtk/gtkrecentmanager.h
+       * gtk/gtksearchengine.h
+       * gtk/gtktexttag.h
+       * gtk/gtktreeselection.h
+       * gtk/gtktreeviewcolumn.h
+       * gtk/gtkuimanager.h: remove redundant inclusion of <glib.h> and
+       <glib-object.h>. There is no point in relying on them being pulled
+       in by other headers in some places and placing them explicitly in
+       other places, so choose the "as little includes as possible"
+       approach and get rid of them.
+
 2008-06-23  Kristian Rietveld  <kris@imendio.com>
 
        * gdk/gdkenumtypes.h.template:

diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 4e1675dd0d34ad085168c812c5db337e0b521e9c..7c3177b68e690cbc5293d6a5924d8a51e7b8503d 100644 (file)
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -36,7 +36,6 @@
 #define __GTK_ACTION_H__
 
 #include <gtk/gtkwidget.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 73dbcbde013b583549993fdc2e1c2a1b50fcb9d5..bff876d0cb8690ea67d384b82f7aa61440b3d0fc 100644 (file)
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_BUILDABLE_H__
 #define __GTK_BUILDABLE_H__
 
-#include <glib.h>
 #include <gtk/gtkbuilder.h>
 #include <gtk/gtktypeutils.h>
 

diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index ded6f238bea3e20ef824fc14c92a241210fc4382..b860e6e12c5838de1cf2efbe5da54ceafa779f9d 100644 (file)
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -21,7 +21,6 @@
 #ifndef __GTK_BUILDER_PRIVATE_H__
 #define __GTK_BUILDER_PRIVATE_H__
 
-#include <glib-object.h>
 #include "gtkbuilder.h"
 
 typedef struct {

diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index b1e9fb8a8146b30b4eade08d161ff993af3495a1..b3d8d060909ccf3e964e1908a3fc158cb0a2b288 100644 (file)
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -24,8 +24,6 @@
 #ifndef __GTK_CELL_LAYOUT_H__
 #define __GTK_CELL_LAYOUT_H__
 
-#include <glib-object.h>
-
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtktreeviewcolumn.h>
 #include <gtk/gtkbuildable.h>

diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 14365ff613328021d8e815b5bacc60b07341bb84..f0f05aa4306fda33aaaed4b87efab7ee34ae4f07 100644 (file)
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -24,8 +24,6 @@
 #ifndef __GTK_ENTRY_COMPLETION_H__
 #define __GTK_ENTRY_COMPLETION_H__
 
-#include <glib-object.h>
-
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeviewcolumn.h>

diff --git a/gtk/gtkfilechoosersettings.h b/gtk/gtkfilechoosersettings.h
index bde1eeeaa21bab1c178b047c7a4e2248a79b45af..c7c4179d3845f28c0daf0b528507f45d955c6f00 100644 (file)
--- a/gtk/gtkfilechoosersettings.h
+++ b/gtk/gtkfilechoosersettings.h
@@ -23,7 +23,6 @@
 #ifndef __GTK_FILE_CHOOSER_SETTINGS_H__
 #define __GTK_FILE_CHOOSER_SETTINGS_H__
 
-#include <glib-object.h>
 #include "gtkfilechooserprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index fa708fe570f680d45653e9e6f4ddad514572b703..87eaf54236c6cf547bc4bee129f4c0db447e9bd7 100644 (file)
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -22,7 +22,6 @@
 #define __GTK_FILE_SYSTEM_H__
 
 #include <gio/gio.h>
-#include <glib-object.h>
 #include <gtk/gtkwidget.h>     /* For icon handling */
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h
index 664aaf2b3737b600acad23217d21d546da1d6ecb..750fa3366343105fe09da00a41fc612108e1e7ae 100644 (file)
--- a/gtk/gtkfilesystemmodel.h
+++ b/gtk/gtkfilesystemmodel.h
@@ -21,7 +21,6 @@
 #ifndef __GTK_FILE_SYSTEM_MODEL_H__
 #define __GTK_FILE_SYSTEM_MODEL_H__
 
-#include <glib-object.h>
 #include "gtkfilesystem.h"
 #include <gtk/gtktreemodel.h>
 

diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 74f6e300777bce00666b4e85d38427410b569545..b6d7d31fe2974ec5524153f3a995cb8d1d1b343e 100644 (file)
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -24,7 +24,6 @@
 #ifndef __GTK_ICON_THEME_H__
 #define __GTK_ICON_THEME_H__
 
-#include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
 

diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index a621673e9c04e7501e1226da3cf103df628ef4b3..8be025c97ddfc7870bf6cc9251996175c6339234 100644 (file)
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -29,7 +29,6 @@
 #ifndef __GTK_LINK_BUTTON_H__
 #define __GTK_LINK_BUTTON_H__
 
-#include <glib.h>
 #include <gtk/gtkbutton.h>
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index edabb32d7de6ec6a458969f7094e34d5736b9186..635c7efb9b218a4af71ac42db2265937c109854d 100644 (file)
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_PAGE_SETUP_H__
 #define __GTK_PAGE_SETUP_H__
 
-#include <glib-object.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkpapersize.h>
 

diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 49324fb2090df03d4e95454a848adfc731a550c6..d7940e62d094bea258ce9d304520a2e71ead7104 100644 (file)
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_PAPER_SIZE_H__
 #define __GTK_PAPER_SIZE_H__
 
-#include <glib-object.h>
 #include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 5c69b9aa52220bfdd84cf890b8229d19e17ef1eb..debeed6ae59ccbe1b4ba3f73da979ad55a54c833 100644 (file)
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_PRINT_CONTEXT_H__
 #define __GTK_PRINT_CONTEXT_H__
 
-#include <glib-object.h>
 #include <pango/pango.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkpagesetup.h>

diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 00f8de6bffc985533fda56596e678fe24701fded..6e6565fc08ed400d3d66cbde04aa53fb9b2d1a71 100644 (file)
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_PRINT_OPERATION_H__
 #define __GTK_PRINT_OPERATION_H__
 
-#include <glib-object.h>
 #include <cairo.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkenums.h>

diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index c098a25f4ac4f59046838963dc91434a221985b1..a36b4afb719128be610305ba84bdb1061033dd2f 100644 (file)
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_PRINT_OPERATION_PREVIEW_H__
 #define __GTK_PRINT_OPERATION_PREVIEW_H__
 
-#include <glib-object.h>
 #include <cairo.h>
 #include <gtk/gtkprintcontext.h>
 

diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 493160b651382b82a25138aefec5c70e312a32af..169e22b28f39dcb7b453985acbbf9114c92a2078 100644 (file)
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_PRINT_SETTINGS_H__
 #define __GTK_PRINT_SETTINGS_H__
 
-#include <glib-object.h>
 #include <gtk/gtkpapersize.h>
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkrecentchooserprivate.h b/gtk/gtkrecentchooserprivate.h
index afe8928f758686bc829711d49bf484176c72b9fa..1057d051900a8fdcd52d437a9f1bd45f0497b44c 100644 (file)
--- a/gtk/gtkrecentchooserprivate.h
+++ b/gtk/gtkrecentchooserprivate.h
@@ -19,12 +19,10 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 #ifndef __GTK_RECENT_CHOOSER_PRIVATE_H__
 #define __GTK_RECENT_CHOOSER_PRIVATE_H__
 
-#include <glib-object.h>
-
 #include "gtkrecentmanager.h"
 #include "gtkrecentchooser.h"
 
@@ -40,5 +38,5 @@ void              _gtk_recent_chooser_item_activated     (GtkRecentChooser  *cho
 void              _gtk_recent_chooser_selection_changed  (GtkRecentChooser  *chooser);
 
 G_END_DECLS
- 
+
 #endif /* ! __GTK_RECENT_CHOOSER_PRIVATE_H__ */

diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 2c171ef913e80a984c5d40fe892792e89f656b6a..4127e67b21ff9c1fe890aa57399743e8de1095e8 100644 (file)
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -25,7 +25,6 @@
 #ifndef __GTK_RECENT_MANAGER_H__
 #define __GTK_RECENT_MANAGER_H__
 
-#include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
 #include <time.h>

diff --git a/gtk/gtksearchengine.h b/gtk/gtksearchengine.h
index 3b0a34c8c05dcf323c45bc17fd3bf41bd878d016..91251b3d3b662b7b4f8945964505a0f1987a07bd 100644 (file)
--- a/gtk/gtksearchengine.h
+++ b/gtk/gtksearchengine.h
@@ -23,7 +23,6 @@
 #ifndef __GTK_SEARCH_ENGINE_H__
 #define __GTK_SEARCH_ENGINE_H__
 
-#include <glib-object.h>
 #include "gtkquery.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 4123768a4a4481f1f9630c8a690ab9acf633560b..b1df01165e4d9abfe2d3b862e7c1d90f15502ccc 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -54,7 +54,6 @@
 #ifndef __GTK_TEXT_TAG_H__
 #define __GTK_TEXT_TAG_H__
 
-#include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 

diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 885b144e929add8f4b853dffe68a4383b79d199f..ece7ab8e6c200e84501804244a1f07f10bf8af94 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -24,10 +24,8 @@
 #ifndef __GTK_TREE_SELECTION_H__
 #define __GTK_TREE_SELECTION_H__
 
-#include <glib-object.h>
 #include <gtk/gtktreeview.h>
 
-
 G_BEGIN_DECLS
 
 
@@ -124,5 +122,4 @@ void             gtk_tree_selection_unselect_range      (GtkTreeSelection
 
 G_END_DECLS
 
-
 #endif /* __GTK_TREE_SELECTION_H__ */

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 9552b277f99fe54bb1b0c92fa4c2a0e645247062..9238a623ce395bad0f3045ad03dcd257bf151f3e 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -24,7 +24,6 @@
 #ifndef __GTK_TREE_VIEW_COLUMN_H__
 #define __GTK_TREE_VIEW_COLUMN_H__
 
-#include <glib-object.h>
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>

diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 1b1765f2fef8352344c1f79accbccac3f96f9a28..240c7d30ba6ace765cdfdeaf0172d8c45a68c37c 100644 (file)
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -35,9 +35,6 @@
 #ifndef __GTK_UI_MANAGER_H__
 #define __GTK_UI_MANAGER_H__
 
-
-#include <glib.h>
-#include <glib-object.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkaction.h>